Sync 3.x by abnegate · Pull Request #782 · utopia-php/database

abnegate · 2026-01-14T09:32:02Z

Summary by CodeRabbit

New Features
- Added regex pattern matching support for queries across adapters with PCRE and POSIX variants.
- Introduced trigram indexes for optimized text search on supported databases.
- Added elemMatch operator for filtering nested array elements.
- Enhanced object attribute indexing capabilities.
Bug Fixes
- Added timeout protection for regex patterns to prevent performance issues.
Improvements
- More specific validation error messages for integer fields.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

…hing with existing collections

* support for object contains , not contains, equals, not equals

…in adapter

…indexed and associative arrays

…Validator classes

…ttributes, unique indexes, and fulltext indexes

…allow mixed lists and improve depth handling

Co-authored-by: Jake Barnby <jakeb994@gmail.com>

…es and update related logic

…nal session scenarios

coderabbitai · 2026-01-14T09:32:15Z

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

This PR introduces regex queries, trigram indexing, and object index capabilities across database adapters. It adds new query types (TYPE_REGEX, TYPE_ELEM_MATCH), an index constant (INDEX_TRIGRAM), and capability-checking methods across all adapters with varying implementation levels. Postgres and Mongo provide advanced support, while MariaDB and SQLite declare minimal support.

Changes

Cohort / File(s)	Summary
Base Adapter API `src/Database/Adapter.php`	Introduces five new abstract/concrete capability methods: `getSupportForObjectIndexes()`, `getSupportForTrigramIndex()`, `getSupportForPCRERegex()`, `getSupportForPOSIXRegex()`, and a composed helper `getSupportForRegex()` that returns logical OR of regex support.
SQL Adapter Implementations `src/Database/Adapter/MariaDB.php`, `src/Database/Adapter/MySQL.php`, `src/Database/Adapter/SQLite.php`	Each adds concrete capability methods. MariaDB: all false except PCRE=true. MySQL: adds `getSupportForObjectIndexes()` + regex timeout handling via `regexp_time_limit`. SQLite: all three capability methods return false.
PostgreSQL Adapter `src/Database/Adapter/Postgres.php`	Adds five capability methods with support for POSIX regex (true), trigram indexes (true), and object indexes (true); extends index creation to handle TRIGRAM and OBJECT types with GIN expressions; installs pg_trgm extension during database creation.
MongoDB Adapter `src/Database/Adapter/Mongo.php`	Implements four capability methods (PCRE/POSIX/trigram/object); introduces three private helpers (`convertStdClassToArray`, `flattenWithDotNotation`, `handleObjectFilters`) to support nested object querying and dot-notation filtering.
SQL Generic Adapter `src/Database/Adapter/SQL.php`	Adds `getRegexOperator(): string` returning 'REGEXP' and integrates it into `getSQLOperator()` for regex query type mapping.
Pool Adapter `src/Database/Adapter/Pool.php`	Adds four delegation methods for new capability checks: `getSupportForPCRERegex()`, `getSupportForPOSIXRegex()`, `getSupportForTrigramIndex()`, `getSupportForObjectIndexes()`.
Core Query Class `src/Database/Query.php`	Adds two new public constants: `TYPE_REGEX` and `TYPE_ELEM_MATCH`; includes them in TYPES and LOGICAL_TYPES; adds static helpers `regex()` and `elemMatch()`; introduces protected `isObjectAttribute` property.
Core Database Class `src/Database/Database.php`	Adds `INDEX_TRIGRAM` constant; replaces `getSupportForObject()` calls with `getSupportForObjectIndexes()` in validators; adds private `isCompatibleObjectValue()` for object type detection; refines object value handling in JSON filter paths.
Index Validator `src/Database/Validator/Index.php`	Adds five new constructor parameters for capability flags (trigram, spatial, key, unique, fulltext); implements three new validation methods (`checkValidIndex`, `checkTrigramIndexes`, `checkKeyUniqueFulltextSupport`) with early guards; tightens control flow to reject unsupported configurations with precise messages.
Queries Validator `src/Database/Validator/Queries.php`	Routes two new query types to FILTER method type: `TYPE_ELEM_MATCH` and `TYPE_REGEX`.
Query Filter Validator `src/Database/Validator/Query/Filter.php`	Improves integer validation to derive bit width from schema size; hardens object query value validation with new recursive `isValidObjectQueryValues()` helper; adds `TYPE_REGEX` to single-value path; implements `TYPE_ELEM_MATCH` case with nested query validation and support guards.
Structure Validator `src/Database/Validator/Structure.php`	Refines VAR_INTEGER validation to compute bit width from attribute size (64 if ≥8 bytes, else 32) with unsigned flag logic.
E2E Adapter Tests `tests/e2e/Adapter/Scopes/DocumentTests.php`, `tests/e2e/Adapter/Scopes/IndexTests.php`, `tests/e2e/Adapter/Scopes/ObjectAttributeTests.php`, `tests/e2e/Adapter/Scopes/SchemalessTests.php`	Adds comprehensive test coverage: regex injection/ReDoS tests, trigram index lifecycle/validation, object attribute indexes, elemMatch behavior, nested object queries with dot notation. Includes new private helper `createAttribute()` in ObjectAttributeTests.
Unit Tests `tests/unit/Validator/IndexTest.php`, `tests/unit/Validator/QueriesTest.php`, `tests/unit/Validator/StructureTest.php`, `tests/e2e/Adapter/Scopes/AttributeTests.php`	Adds trigram index validation unit test; extends object attribute query validation with new meta attribute test cases; updates error message expectations to reflect specific bit-width integer ranges.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Possibly related PRs

Mongo object support and relevant queries #777: Implements Mongo object/elemMatch support with corresponding Query type helpers and object filter conversion methods—directly overlapping with Mongo adapter changes in this PR.
Query regex #775: Adds regex and trigram/index capability support across adapters with similar capability methods and Query::regex helper—substantial overlap with core functionality.
Object(json) attribute support for postgres #741: Adds object/JSON attribute and index support with getSupportForObjectIndexes and INDEX_OBJECT handling—parallel changes to object capability checking and validator wiring.

Suggested reviewers

ArnabChatterjee20k
fogelito

Poem

🐰 Hops with regex joy!
A trigram here, elemMatch there,
Postgres dances, Mongo sings—
Objects nest in SQL's care,
Queries match with fuzzy wings! 🌟

✨ Finishing touches

📝 Generate docstrings

📜 Recent review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 783193d and e491ed2.

⛔ Files ignored due to path filters (1)

composer.lock is excluded by !**/*.lock

📒 Files selected for processing (22)

src/Database/Adapter.php
src/Database/Adapter/MariaDB.php
src/Database/Adapter/Mongo.php
src/Database/Adapter/MySQL.php
src/Database/Adapter/Pool.php
src/Database/Adapter/Postgres.php
src/Database/Adapter/SQL.php
src/Database/Adapter/SQLite.php
src/Database/Database.php
src/Database/Query.php
src/Database/Validator/Index.php
src/Database/Validator/Queries.php
src/Database/Validator/Query/Filter.php
src/Database/Validator/Structure.php
tests/e2e/Adapter/Scopes/AttributeTests.php
tests/e2e/Adapter/Scopes/DocumentTests.php
tests/e2e/Adapter/Scopes/IndexTests.php
tests/e2e/Adapter/Scopes/ObjectAttributeTests.php
tests/e2e/Adapter/Scopes/SchemalessTests.php
tests/unit/Validator/IndexTest.php
tests/unit/Validator/QueriesTest.php
tests/unit/Validator/StructureTest.php

_{✏️ Tip: You can disable this entire section by setting review_details to false in your review settings.}

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

ArnabChatterjee20k and others added 30 commits December 31, 2025 11:20

added regex query support for the mongodb(schema + schemaless)

67c583a

added support for regex in mysql/mariadb

dbb3c79

add regex support methods for database adapters

2995d34

add support for trigram indexes in Postgres adapter and validation

4c6dbbb

added cleanup of collection for the testFindRegex

2e13e92

changed the collection name from movies to moviesRegex to remove clas…

cc90ed1

…hing with existing collections

added trigram index in the index vaidator in the databases

e4b7c45

updated the size of the attr in testTrigramIndexValidation

e18512d

fixed typo

d50f1f2

fixed mariadb support methods

e0e2b9d

* added object attribute support in mongodb

94c7012

* support for object contains , not contains, equals, not equals

added elemMatch

3b5360b

refactor: improve elemMatch handling and clean up code style

7a26698

refactor: streamline elemMatch validation and update schemaless tests

c2e1670

refactor: update ObjectAttributeTests to check for attribute support …

e4f00f3

…in adapter

feat: add support for object (JSON) indexes across database adapters

b397af6

updated tests for elemMatch

3f85b56

refactor: enhance object query validation and add corresponding tests

c579ec5

linting

3c04a4b

Add support for regex and enhance index validation in database adapter

57507d6

Merge remote-tracking branch 'upstream/3.x' into query-regex

ccb69f0

refactor: improve validation logic for object query values to handle …

1214e56

…indexed and associative arrays

Merge remote-tracking branch 'upstream/3.x' into mongo-object

9534938

Refactor index validation and enhance support checks in Database and …

8bd5e0e

…Validator classes

Enhance index validation tests by adding support checks for spatial a…

7da7023

…ttributes, unique indexes, and fulltext indexes

refactor: enhance validation for object attribute query values to dis…

d511a60

…allow mixed lists and improve depth handling

removed redundant size from the attribute test

82f2bac

Merge pull request #775 from utopia-php/query-regex

6a98a5d

Update src/Database/Adapter/Mongo.php

473f3c4

Co-authored-by: Jake Barnby <jakeb994@gmail.com>

Merge remote-tracking branch 'upstream/3.x' into mongo-object

6d6b975

ArnabChatterjee20k and others added 15 commits January 8, 2026 20:20

refactor: rename getSupportForIndexObject to getSupportForObjectIndex…

d52f10e

…es and update related logic

linting

93ea96f

linting

6cfac6f

updated index validator

838068b

updated database index validator

2aadc20

test: add schemaless nested object attribute queries

1556e6e

fix: adjust condition for schemaless object attribute support in tests

887775d

test: enhance schemaless nested object attribute queries with additio…

6de1a2d

…nal session scenarios

updated tests

85be9a8

Merge pull request #777 from utopia-php/mongo-object

43505a1

Handle bits/sign

655c072

Update lock

77b234a

Fix assertions

b06347f

Fix attribute tests

093370b

Merge pull request #781 from utopia-php/fix-validator-bits

e491ed2

abnegate changed the title ~~added regex query support for the mongodb(schema + schemaless)~~ Sync 3.x Jan 14, 2026

abnegate closed this Jan 14, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync 3.x#782

Sync 3.x#782
abnegate wants to merge 45 commits intomainfrom
3.x

abnegate commented Jan 14, 2026 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Jan 14, 2026 •

edited

Loading

Review failed

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested reviewers

Poem

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

abnegate commented Jan 14, 2026 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review failed

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested reviewers

Poem

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

abnegate commented Jan 14, 2026 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Jan 14, 2026 •

edited

Loading